home *** CD-ROM | disk | FTP | other *** search
| MacBinary | 1994-09-04 | 11.4 KB | [TEXT/ALFA] |
open in: 
MacOS 8.1
|
Win98
|
DOS
view JSON data
|
view as text
This file was processed as: MacBinary
(archive/macBinary).
You can browse this item here: Diff Help
| Confidence | Program | Detection | Match Type | Support
|
|---|
| 10%
| dexvert
| MacBinary (archive/macBinary)
| fallback
| Supported |
| 1%
| dexvert
| Text File (text/txt)
| fallback
| Supported |
| 100%
| file
| MacBinary II, inited, Sun Sep 4 16:48:20 1994, modified Sun Sep 4 16:48:20 1994, creator Alpha editor, type ASCII, 9371 bytes "Diff Help" , at 0x251b 1989 bytes resource
| default (weak)
| |
| 99%
| file
| data
| default
| |
| 74%
| TrID
| Macintosh plain text (MacBinary)
| default
| |
| 25%
| TrID
| MacBinary 2
| default (weak)
| |
| 100%
| siegfried
| fmt/1762 MacBinary (II)
| default
| |
| 100%
| lsar
| MacBinary
| default
|
|
| id metadata |
|---|
| key | value |
|---|
| macFileType | [TEXT] |
| macFileCreator | [ALFA] |
hex view+--------+-------------------------+-------------------------+--------+--------+
|00000000| 00 09 44 69 66 66 20 48 | 65 6c 70 00 00 00 00 00 |..Diff H|elp.....|
|00000010| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000020| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000030| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000040| 00 54 45 58 54 41 4c 46 | 41 01 00 00 00 00 00 00 |.TEXTALF|A.......|
|00000050| 00 00 00 00 00 24 9b 00 | 00 07 c5 aa 8f e3 14 aa |.....$..|........|
|00000060| 8f e3 14 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00000070| 00 00 00 00 00 00 00 00 | 00 00 81 81 e8 5b 00 00 |........|.....[..|
|00000080| 0d 0d 0d 44 49 46 46 28 | 31 29 20 20 20 20 20 20 |...DIFF(|1) |
|00000090| 20 20 20 20 20 20 20 20 | 20 20 20 20 55 53 45 52 | | USER|
|000000a0| 20 43 4f 4d 4d 41 4e 44 | 53 20 20 20 20 20 20 20 | COMMAND|S |
|000000b0| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 44 49 46 | | DIF|
|000000c0| 46 28 31 29 0d 0d 0d 0d | 4e 41 4d 45 0d 20 20 20 |F(1)....|NAME. |
|000000d0| 20 20 64 69 66 66 20 2d | 20 64 69 73 70 6c 61 79 | diff -| display|
|000000e0| 20 6c 69 6e 65 2d 62 79 | 2d 6c 69 6e 65 20 20 64 | line-by|-line d|
|000000f0| 69 66 66 65 72 65 6e 63 | 65 73 20 20 62 65 74 77 |ifferenc|es betw|
|00000100| 65 65 6e 20 20 70 61 69 | 72 73 20 20 6f 66 0d 20 |een pai|rs of. |
|00000110| 20 20 20 20 74 65 78 74 | 20 66 69 6c 65 73 0d 0d | text| files..|
|00000120| 53 59 4e 4f 50 53 49 53 | 0d 20 20 20 20 20 64 69 |SYNOPSIS|. di|
|00000130| 66 66 20 5b 20 2d 62 69 | 74 77 20 5d 20 5b 20 2d |ff [ -bi|tw ] [ -|
|00000140| 63 20 5b 20 23 20 5d 20 | 7c 20 2d 65 20 7c 20 2d |c [ # ] || -e | -|
|00000150| 66 20 7c 20 2d 6e 20 7c | 20 2d 68 20 20 5d 20 20 |f | -n || -h ] |
|00000160| 20 66 69 6c 65 6e 61 6d | 65 31 0d 20 20 20 20 20 | filenam|e1. |
|00000170| 66 69 6c 65 6e 61 6d 65 | 32 0d 20 20 20 20 20 64 |filename|2. d|
|00000180| 69 66 66 20 5b 20 2d 62 | 69 74 77 20 5d 20 5b 20 |iff [ -b|itw ] [ |
|00000190| 2d 44 73 74 72 69 6e 67 | 20 5d 20 20 66 69 6c 65 |-Dstring| ] file|
|000001a0| 6e 61 6d 65 31 20 66 69 | 6c 65 6e 61 6d 65 32 0d |name1 fi|lename2.|
|000001b0| 20 20 20 20 20 64 69 66 | 66 20 5b 20 2d 62 69 74 | dif|f [ -bit|
|000001c0| 77 20 5d 20 5b 20 2d 63 | 20 5b 20 23 20 5d 20 7c |w ] [ -c| [ # ] ||
|000001d0| 20 2d 65 20 7c 20 2d 66 | 20 7c 20 2d 6e 20 7c 20 | -e | -f| | -n | |
|000001e0| 2d 68 20 5d 20 5b 20 2d | 6c 20 5d 20 5b 20 20 2d |-h ] [ -|l ] [ -|
|000001f0| 72 0d 20 20 20 20 20 5d | 20 5b 20 2d 73 20 5d 20 |r. ]| [ -s ] |
|00000200| 5b 20 2d 53 6e 61 6d 65 | 20 5d 20 20 64 69 72 65 |[ -Sname| ] dire|
|00000210| 63 74 6f 72 79 31 20 64 | 69 72 65 63 74 6f 72 79 |ctory1 d|irectory|
|00000220| 32 0d 0d 44 45 53 43 52 | 49 50 54 49 4f 4e 0d 20 |2..DESCR|IPTION. |
|00000230| 20 20 20 20 64 69 66 66 | 20 69 73 20 61 20 64 69 | diff| is a di|
|00000240| 66 66 65 72 65 6e 74 69 | 61 6c 20 66 69 6c 65 20 |fferenti|al file |
|00000250| 63 6f 6d 70 61 72 61 74 | 6f 72 2e 20 20 57 68 65 |comparat|or. Whe|
|00000260| 6e 20 72 75 6e 20 6f 6e | 20 72 65 67 75 6c 61 72 |n run on| regular|
|00000270| 0d 20 20 20 20 20 66 69 | 6c 65 73 2c 20 20 61 6e |. fi|les, an|
|00000280| 64 20 20 77 68 65 6e 20 | 20 63 6f 6d 70 61 72 69 |d when | compari|
|00000290| 6e 67 20 20 74 65 78 74 | 20 20 66 69 6c 65 73 20 |ng text| files |
|000002a0| 74 68 61 74 20 64 69 66 | 66 65 72 20 64 75 72 69 |that dif|fer duri|
|000002b0| 6e 67 0d 20 20 20 20 20 | 64 69 72 65 63 74 6f 72 |ng. |director|
|000002c0| 79 20 63 6f 6d 70 61 72 | 69 73 6f 6e 20 20 28 73 |y compar|ison (s|
|000002d0| 65 65 20 20 74 68 65 20 | 20 6e 6f 74 65 73 20 20 |ee the | notes |
|000002e0| 62 65 6c 6f 77 20 20 6f | 6e 20 20 63 6f 6d 70 61 |below o|n compa|
|000002f0| 72 69 6e 67 0d 20 20 20 | 20 20 64 69 72 65 63 74 |ring. | direct|
|00000300| 6f 72 69 65 73 29 2c 20 | 20 64 69 66 66 20 20 74 |ories), | diff t|
|00000310| 65 6c 6c 73 20 77 68 61 | 74 20 6c 69 6e 65 73 20 |ells wha|t lines |
|00000320| 6d 75 73 74 20 62 65 20 | 63 68 61 6e 67 65 64 20 |must be |changed |
|00000330| 69 6e 20 74 68 65 0d 20 | 20 20 20 20 66 69 6c 65 |in the. | file|
|00000340| 73 20 74 6f 20 62 72 69 | 6e 67 20 74 68 65 6d 20 |s to bri|ng them |
|00000350| 69 6e 74 6f 20 61 67 72 | 65 65 6d 65 6e 74 2e 20 |into agr|eement. |
|00000360| 20 20 45 78 63 65 70 74 | 20 20 69 6e 20 20 72 61 | Except| in ra|
|00000370| 72 65 20 20 63 69 72 2d | 0d 20 20 20 20 20 63 75 |re cir-|. cu|
|00000380| 6d 73 74 61 6e 63 65 73 | 2c 20 20 64 69 66 66 20 |mstances|, diff |
|00000390| 66 69 6e 64 73 20 61 20 | 73 6d 61 6c 6c 65 73 74 |finds a |smallest|
|000003a0| 20 73 75 66 66 69 63 69 | 65 6e 74 20 73 65 74 20 | suffici|ent set |
|000003b0| 6f 66 20 64 69 66 66 65 | 72 2d 0d 20 20 20 20 20 |of diffe|r-. |
|000003c0| 65 6e 63 65 73 2e 20 20 | 49 66 20 6e 65 69 74 68 |ences. |If neith|
|000003d0| 65 72 20 66 69 6c 65 6e | 61 6d 65 31 20 6e 6f 72 |er filen|ame1 nor|
|000003e0| 20 66 69 6c 65 6e 61 6d | 65 32 20 69 73 20 20 61 | filenam|e2 is a|
|000003f0| 20 20 64 69 72 65 63 74 | 6f 72 79 2c 0d 20 20 20 | direct|ory,. |
|00000400| 20 20 65 69 74 68 65 72 | 20 6d 61 79 20 62 65 20 | either| may be |
|00000410| 67 69 76 65 6e 20 61 73 | 20 60 2d 27 2c 20 69 6e |given as| `-', in|
|00000420| 20 77 68 69 63 68 20 63 | 61 73 65 20 74 68 65 20 | which c|ase the |
|00000430| 73 74 61 6e 64 61 72 64 | 20 69 6e 70 75 74 0d 20 |standard| input. |
|00000440| 20 20 20 20 69 73 20 75 | 73 65 64 2e 20 20 49 66 | is u|sed. If|
|00000450| 20 66 69 6c 65 6e 61 6d | 65 31 20 69 73 20 61 20 | filenam|e1 is a |
|00000460| 64 69 72 65 63 74 6f 72 | 79 2c 20 61 20 66 69 6c |director|y, a fil|
|00000470| 65 20 69 6e 20 74 68 61 | 74 20 64 69 72 65 63 2d |e in tha|t direc-|
|00000480| 0d 20 20 20 20 20 74 6f | 72 79 20 77 68 6f 73 65 |. to|ry whose|
|00000490| 20 66 69 6c 65 6e 61 6d | 65 20 69 73 20 74 68 65 | filenam|e is the|
|000004a0| 20 73 61 6d 65 20 61 73 | 20 74 68 65 20 66 69 6c | same as| the fil|
|000004b0| 65 6e 61 6d 65 20 6f 66 | 20 66 69 6c 65 6e 61 6d |ename of| filenam|
|000004c0| 65 32 0d 20 20 20 20 20 | 69 73 20 75 73 65 64 20 |e2. |is used |
|000004d0| 28 61 6e 64 20 76 69 63 | 65 20 76 65 72 73 61 29 |(and vic|e versa)|
|000004e0| 2e 0d 0d 20 20 20 20 20 | 54 68 65 72 65 20 61 72 |... |There ar|
|000004f0| 65 20 73 65 76 65 72 61 | 6c 20 6f 70 74 69 6f 6e |e severa|l option|
|00000500| 73 20 66 6f 72 20 20 6f | 75 74 70 75 74 20 20 66 |s for o|utput f|
|00000510| 6f 72 6d 61 74 3b 20 20 | 74 68 65 20 20 64 65 66 |ormat; |the def|
|00000520| 61 75 6c 74 0d 20 20 20 | 20 20 6f 75 74 70 75 74 |ault. | output|
|00000530| 20 66 6f 72 6d 61 74 20 | 63 6f 6e 74 61 69 6e 73 | format |contains|
|00000540| 20 6c 69 6e 65 73 20 6f | 66 20 74 68 65 73 65 20 | lines o|f these |
|00000550| 66 6f 72 6d 73 3a 0d 0d | 20 20 20 20 20 20 20 20 |forms:..| |
|00000560| 20 20 6e 31 20 61 20 6e | 33 2c 6e 34 0d 20 20 20 | n1 a n|3,n4. |
|00000570| 20 20 20 20 20 20 20 6e | 31 2c 6e 32 20 64 20 6e | n|1,n2 d n|
|00000580| 33 0d 20 20 20 20 20 20 | 20 20 20 20 6e 31 2c 6e |3. | n1,n|
|00000590| 32 20 63 20 6e 33 2c 6e | 34 0d 0d 20 20 20 20 20 |2 c n3,n|4.. |
|000005a0| 54 68 65 73 65 20 6c 69 | 6e 65 73 20 72 65 73 65 |These li|nes rese|
|000005b0| 6d 62 6c 65 20 65 64 28 | 31 29 20 20 63 6f 6d 6d |mble ed(|1) comm|
|000005c0| 61 6e 64 73 20 20 74 6f | 20 20 63 6f 6e 76 65 72 |ands to| conver|
|000005d0| 74 20 20 66 69 6c 65 6e | 61 6d 65 31 0d 20 20 20 |t filen|ame1. |
|000005e0| 20 20 69 6e 74 6f 20 20 | 66 69 6c 65 6e 61 6d 65 | into |filename|
|000005f0| 32 2e 20 20 20 54 68 65 | 20 20 6e 75 6d 62 65 72 |2. The| number|
|00000600| 73 20 61 66 74 65 72 20 | 74 68 65 20 6c 65 74 74 |s after |the lett|
|00000610| 65 72 73 20 70 65 72 74 | 61 69 6e 20 74 6f 0d 20 |ers pert|ain to. |
|00000620| 20 20 20 20 66 69 6c 65 | 6e 61 6d 65 32 2e 20 20 | file|name2. |
|00000630| 49 6e 20 66 61 63 74 2c | 20 62 79 20 65 78 63 68 |In fact,| by exch|
|00000640| 61 6e 67 69 6e 67 20 61 | 20 66 6f 72 20 64 20 61 |anging a| for d a|
|00000650| 6e 64 20 72 65 61 64 69 | 6e 67 20 62 61 63 6b 2d |nd readi|ng back-|
|00000660| 0d 20 20 20 20 20 77 61 | 72 64 20 6f 6e 65 20 6d |. wa|rd one m|
|00000670| 61 79 20 61 73 63 65 72 | 74 61 69 6e 20 65 71 75 |ay ascer|tain equ|
|00000680| 61 6c 6c 79 20 68 6f 77 | 20 74 6f 20 63 6f 6e 76 |ally how| to conv|
|00000690| 65 72 74 20 66 69 6c 65 | 6e 61 6d 65 32 20 69 6e |ert file|name2 in|
|000006a0| 74 6f 0d 20 20 20 20 20 | 66 69 6c 65 6e 61 6d 65 |to. |filename|
|000006b0| 31 2e 20 20 41 73 20 69 | 6e 20 65 64 28 31 29 2c |1. As i|n ed(1),|
|000006c0| 20 69 64 65 6e 74 69 63 | 61 6c 20 70 61 69 72 73 | identic|al pairs|
|000006d0| 2c 20 77 68 65 72 65 20 | 6e 31 20 3d 20 20 6e 32 |, where |n1 = n2|
|000006e0| 20 20 6f 72 0d 20 20 20 | 20 20 6e 33 20 3d 20 6e | or. | n3 = n|
|000006f0| 34 2c 20 61 72 65 20 61 | 62 62 72 65 76 69 61 74 |4, are a|bbreviat|
|00000700| 65 64 20 61 73 20 61 20 | 73 69 6e 67 6c 65 20 6e |ed as a |single n|
|00000710| 75 6d 62 65 72 2e 0d 0d | 20 20 20 20 20 46 6f 6c |umber...| Fol|
|00000720| 6c 6f 77 69 6e 67 20 65 | 61 63 68 20 6f 66 20 74 |lowing e|ach of t|
|00000730| 68 65 73 65 20 6c 69 6e | 65 73 20 63 6f 6d 65 20 |hese lin|es come |
|00000740| 61 6c 6c 20 74 68 65 20 | 20 6c 69 6e 65 73 20 20 |all the | lines |
|00000750| 74 68 61 74 20 20 61 72 | 65 0d 20 20 20 20 20 61 |that ar|e. a|
|00000760| 66 66 65 63 74 65 64 20 | 20 69 6e 20 20 74 68 65 |ffected | in the|
|00000770| 20 20 66 69 72 73 74 20 | 20 66 69 6c 65 20 20 66 | first | file f|
|00000780| 6c 61 67 67 65 64 20 62 | 79 20 60 3c 27 2c 20 74 |lagged b|y `<', t|
|00000790| 68 65 6e 20 61 6c 6c 20 | 74 68 65 0d 20 20 20 20 |hen all |the. |
|000007a0| 20 6c 69 6e 65 73 20 74 | 68 61 74 20 61 72 65 20 | lines t|hat are |
|000007b0| 61 66 66 65 63 74 65 64 | 20 69 6e 20 74 68 65 20 |affected| in the |
|000007c0| 73 65 63 6f 6e 64 20 66 | 69 6c 65 20 66 6c 61 67 |second f|ile flag|
|000007d0| 67 65 64 20 62 79 20 60 | 3e 27 2e 0d 0d 20 20 20 |ged by `|>'... |
|000007e0| 20 20 49 66 20 62 6f 74 | 68 20 61 72 67 75 6d 65 | If bot|h argume|
|000007f0| 6e 74 73 20 61 72 65 20 | 64 69 72 65 63 74 6f 72 |nts are |director|
|00000800| 69 65 73 2c 20 64 69 66 | 66 20 73 6f 72 74 73 20 |ies, dif|f sorts |
|00000810| 20 74 68 65 20 20 63 6f | 6e 74 65 6e 74 73 0d 20 | the co|ntents. |
|00000820| 20 20 20 20 6f 66 20 20 | 74 68 65 20 20 64 69 72 | of |the dir|
|00000830| 65 63 74 6f 72 69 65 73 | 20 62 79 20 6e 61 6d 65 |ectories| by name|
|00000840| 2c 20 61 6e 64 20 74 68 | 65 6e 20 72 75 6e 73 20 |, and th|en runs |
|00000850| 74 68 65 20 72 65 67 75 | 6c 61 72 20 66 69 6c 65 |the regu|lar file|
|00000860| 0d 20 20 20 20 20 64 69 | 66 66 20 70 72 6f 67 72 |. di|ff progr|
|00000870| 61 6d 20 61 73 20 64 65 | 73 63 72 69 62 65 64 20 |am as de|scribed |
|00000880| 61 62 6f 76 65 20 6f 6e | 20 74 65 78 74 20 66 69 |above on| text fi|
|00000890| 6c 65 73 20 77 68 69 63 | 68 20 61 72 65 20 64 69 |les whic|h are di|
|000008a0| 66 2d 0d 20 20 20 20 20 | 66 65 72 65 6e 74 2e 20 |f-. |ferent. |
|000008b0| 20 20 42 69 6e 61 72 79 | 20 20 66 69 6c 65 73 20 | Binary| files |
|000008c0| 77 68 69 63 68 20 64 69 | 66 66 65 72 2c 20 63 6f |which di|ffer, co|
|000008d0| 6d 6d 6f 6e 20 73 75 62 | 64 69 72 65 63 74 6f 72 |mmon sub|director|
|000008e0| 69 65 73 2c 0d 20 20 20 | 20 20 61 6e 64 20 66 69 |ies,. | and fi|
|000008f0| 6c 65 73 20 77 68 69 63 | 68 20 61 70 70 65 61 72 |les whic|h appear|
|00000900| 20 69 6e 20 6f 6e 6c 79 | 20 6f 6e 65 20 64 69 72 | in only| one dir|
|00000910| 65 63 74 6f 72 79 20 61 | 72 65 20 6c 69 73 74 65 |ectory a|re liste|
|00000920| 64 2e 0d 0d 4f 50 54 49 | 4f 4e 53 0d 20 20 20 20 |d...OPTI|ONS. |
|00000930| 20 2d 62 20 20 20 49 67 | 6e 6f 72 65 20 74 72 61 | -b Ig|nore tra|
|00000940| 69 6c 69 6e 67 20 62 6c | 61 6e 6b 73 20 28 53 50 |iling bl|anks (SP|
|00000950| 41 43 45 20 61 6e 64 20 | 54 41 42 20 20 63 68 61 |ACE and |TAB cha|
|00000960| 72 61 63 74 65 72 73 29 | 20 20 61 6e 64 0d 20 20 |racters)| and. |
|00000970| 20 20 20 20 20 20 20 20 | 74 72 65 61 74 20 61 6c | |treat al|
|00000980| 6c 20 6f 74 68 65 72 20 | 73 74 72 69 6e 67 73 20 |l other |strings |
|00000990| 6f 66 20 62 6c 61 6e 6b | 73 20 61 73 20 65 71 75 |of blank|s as equ|
|000009a0| 69 76 61 6c 65 6e 74 2e | 0d 0d 0d 0d 0d 53 75 6e |ivalent.|.....Sun|
|000009b0| 20 52 65 6c 65 61 73 65 | 20 34 2e 31 20 20 20 20 | Release| 4.1 |
|000009c0| 4c 61 73 74 20 63 68 61 | 6e 67 65 3a 20 32 20 4f |Last cha|nge: 2 O|
|000009d0| 63 74 6f 62 65 72 20 31 | 39 38 39 20 20 20 20 20 |ctober 1|989 |
|000009e0| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 31 0d 0d | | 1..|
|000009f0| 0d 0d 0d 0d 0d 44 49 46 | 46 28 31 29 20 20 20 20 |.....DIF|F(1) |
|00000a00| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 20 55 53 | | US|
|00000a10| 45 52 20 43 4f 4d 4d 41 | 4e 44 53 20 20 20 20 20 |ER COMMA|NDS |
|00000a20| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 20 20 44 | | D|
|00000a30| 49 46 46 28 31 29 0d 0d | 0d 0d 20 20 20 20 20 2d |IFF(1)..|.. -|
|00000a40| 69 20 20 20 49 67 6e 6f | 72 65 20 74 68 65 20 63 |i Igno|re the c|
|00000a50| 61 73 65 20 6f 66 20 6c | 65 74 74 65 72 73 3b 20 |ase of l|etters; |
|00000a60| 66 6f 72 20 65 78 61 6d | 70 6c 65 2c 20 60 41 27 |for exam|ple, `A'|
|00000a70| 20 77 69 6c 6c 20 20 63 | 6f 6d 2d 0d 20 20 20 20 | will c|om-. |
|00000a80| 20 20 20 20 20 20 70 61 | 72 65 20 65 71 75 61 6c | pa|re equal|
|00000a90| 20 74 6f 20 60 61 27 2e | 0d 0d 20 20 20 20 20 2d | to `a'.|.. -|
|00000aa0| 74 20 20 20 45 78 70 61 | 6e 64 20 54 41 42 20 63 |t Expa|nd TAB c|
|00000ab0| 68 61 72 61 63 74 65 72 | 73 20 69 6e 20 6f 75 74 |haracter|s in out|
|00000ac0| 70 75 74 20 6c 69 6e 65 | 73 2e 20 20 20 4e 6f 72 |put line|s. Nor|
|00000ad0| 6d 61 6c 20 20 6f 72 20 | 20 2d 63 0d 20 20 20 20 |mal or | -c. |
|00000ae0| 20 20 20 20 20 20 6f 75 | 74 70 75 74 20 20 61 64 | ou|tput ad|
|00000af0| 64 73 20 20 63 68 61 72 | 61 63 74 65 72 28 73 29 |ds char|acter(s)|
|00000b00| 20 20 74 6f 20 20 74 68 | 65 20 20 66 72 6f 6e 74 | to th|e front|
|00000b10| 20 6f 66 20 65 61 63 68 | 20 6c 69 6e 65 0d 20 20 | of each| line. |
|00000b20| 20 20 20 20 20 20 20 20 | 77 68 69 63 68 20 6d 61 | |which ma|
|00000b30| 79 20 61 6c 74 65 72 20 | 74 68 65 20 69 6e 64 65 |y alter |the inde|
|00000b40| 6e 74 61 74 69 6f 6e 20 | 6f 66 20 74 68 65 20 6f |ntation |of the o|
|00000b50| 72 69 67 69 6e 61 6c 20 | 20 73 6f 75 72 63 65 0d |riginal | source.|
|00000b60| 20 20 20 20 20 20 20 20 | 20 20 6c 69 6e 65 73 20 | | lines |
|00000b70| 20 61 6e 64 20 20 6d 61 | 6b 65 20 74 68 65 20 6f | and ma|ke the o|
|00000b80| 75 74 70 75 74 20 6c 69 | 73 74 69 6e 67 20 64 69 |utput li|sting di|
|00000b90| 66 66 69 63 75 6c 74 20 | 74 6f 20 69 6e 74 65 72 |fficult |to inter|
|00000ba0| 2d 0d 20 20 20 20 20 20 | 20 20 20 20 70 72 65 74 |-. | pret|
|00000bb0| 2e 20 20 54 68 69 73 20 | 6f 70 74 69 6f 6e 20 77 |. This |option w|
|00000bc0| 69 6c 6c 20 70 72 65 73 | 65 72 76 65 20 74 68 65 |ill pres|erve the|
|00000bd0| 20 6f 72 69 67 69 6e 61 | 6c 20 20 73 6f 75 72 63 | origina|l sourc|
|00000be0| 65 27 73 0d 20 20 20 20 | 20 20 20 20 20 20 69 6e |e's. | in|
|00000bf0| 64 65 6e 74 61 74 69 6f | 6e 2e 0d 0d 20 20 20 20 |dentatio|n... |
|00000c00| 20 2d 77 20 20 20 49 67 | 6e 6f 72 65 20 61 6c 6c | -w Ig|nore all|
|00000c10| 20 62 6c 61 6e 6b 73 20 | 28 53 50 41 43 45 20 61 | blanks |(SPACE a|
|00000c20| 6e 64 20 54 41 42 20 63 | 68 61 72 61 63 74 65 72 |nd TAB c|haracter|
|00000c30| 73 29 3b 20 66 6f 72 20 | 65 78 61 6d 2d 0d 20 20 |s); for |exam-. |
|00000c40| 20 20 20 20 20 20 20 20 | 70 6c 65 2c 20 60 69 66 | |ple, `if|
|00000c50| 20 28 20 61 20 3d 3d 20 | 62 20 29 27 20 77 69 6c | ( a == |b )' wil|
|00000c60| 6c 20 63 6f 6d 70 61 72 | 65 20 65 71 75 61 6c 20 |l compar|e equal |
|00000c70| 74 6f 20 60 69 66 28 61 | 3d 3d 62 29 27 2e 0d 0d |to `if(a|==b)'...|
|00000c80| 20 20 20 20 20 54 68 65 | 20 66 6f 6c 6c 6f 77 69 | The| followi|
|00000c90| 6e 67 20 66 6f 75 72 20 | 6f 70 74 69 6f 6e 73 20 |ng four |options |
|00000ca0| 61 72 65 20 6d 75 74 75 | 61 6c 6c 79 20 65 78 63 |are mutu|ally exc|
|00000cb0| 6c 75 73 69 76 65 3a 0d | 0d 20 20 20 20 20 2d 63 |lusive:.|. -c|
|00000cc0| 5b 23 5d 0d 20 20 20 20 | 20 20 20 20 20 20 50 72 |[#]. | Pr|
|00000cd0| 6f 64 75 63 65 20 61 20 | 6c 69 73 74 69 6e 67 20 |oduce a |listing |
|00000ce0| 6f 66 20 64 69 66 66 65 | 72 65 6e 63 65 73 20 77 |of diffe|rences w|
|00000cf0| 69 74 68 20 6c 69 6e 65 | 73 20 6f 66 20 63 6f 6e |ith line|s of con|
|00000d00| 74 65 78 74 2e 0d 20 20 | 20 20 20 20 20 20 20 20 |text.. | |
|00000d10| 54 68 65 20 64 65 66 61 | 75 6c 74 20 69 73 20 74 |The defa|ult is t|
|00000d20| 6f 20 70 72 65 73 65 6e | 74 20 33 20 6c 69 6e 65 |o presen|t 3 line|
|00000d30| 73 20 6f 66 20 63 6f 6e | 74 65 78 74 20 61 6e 64 |s of con|text and|
|00000d40| 20 6d 61 79 20 62 65 0d | 20 20 20 20 20 20 20 20 | may be.| |
|00000d50| 20 20 63 68 61 6e 67 65 | 64 2c 20 28 74 6f 20 31 | change|d, (to 1|
|00000d60| 30 2c 20 66 6f 72 20 65 | 78 61 6d 70 6c 65 29 2c |0, for e|xample),|
|00000d70| 20 62 79 20 2d 63 31 30 | 2e 20 20 20 57 69 74 68 | by -c10|. With|
|00000d80| 20 20 2d 63 20 20 74 68 | 65 0d 20 20 20 20 20 20 | -c th|e. |
|00000d90| 20 20 20 20 6f 75 74 70 | 75 74 20 66 6f 72 6d 61 | outp|ut forma|
|00000da0| 74 20 69 73 20 6d 6f 64 | 69 66 69 65 64 20 73 6c |t is mod|ified sl|
|00000db0| 69 67 68 74 6c 79 3a 20 | 20 6f 75 74 70 75 74 20 |ightly: | output |
|00000dc0| 62 65 67 69 6e 73 20 77 | 69 74 68 0d 20 20 20 20 |begins w|ith. |
|00000dd0| 20 20 20 20 20 20 69 64 | 65 6e 74 69 66 69 63 61 | id|entifica|
|00000de0| 74 69 6f 6e 20 6f 66 20 | 74 68 65 20 66 69 6c 65 |tion of |the file|
|00000df0| 73 20 69 6e 76 6f 6c 76 | 65 64 20 61 6e 64 20 74 |s involv|ed and t|
|00000e00| 68 65 69 72 20 63 72 65 | 61 74 69 6f 6e 0d 20 20 |heir cre|ation. |
|00000e10| 20 20 20 20 20 20 20 20 | 64 61 74 65 73 2c 20 20 | |dates, |
|00000e20| 74 68 65 6e 20 20 65 61 | 63 68 20 63 68 61 6e 67 |then ea|ch chang|
|00000e30| 65 20 69 73 20 73 65 70 | 61 72 61 74 65 64 20 62 |e is sep|arated b|
|00000e40| 79 20 61 20 6c 69 6e 65 | 20 77 69 74 68 20 61 0d |y a line| with a.|
|00000e50| 20 20 20 20 20 20 20 20 | 20 20 64 6f 7a 65 6e 20 | | dozen |
|00000e60| 2a 73 2e 20 20 54 68 65 | 20 6c 69 6e 65 73 20 72 |*s. The| lines r|
|00000e70| 65 6d 6f 76 65 64 20 66 | 72 6f 6d 20 66 69 6c 65 |emoved f|rom file|
|00000e80| 6e 61 6d 65 31 20 61 72 | 65 20 20 6d 61 72 6b 65 |name1 ar|e marke|
|00000e90| 64 0d 20 20 20 20 20 20 | 20 20 20 20 77 69 74 68 |d. | with|
|00000ea0| 20 20 60 2d 20 20 27 3b | 20 20 74 68 6f 73 65 20 | `- ';| those |
|00000eb0| 61 64 64 65 64 20 74 6f | 20 66 69 6c 65 6e 61 6d |added to| filenam|
|00000ec0| 65 32 20 61 72 65 20 6d | 61 72 6b 65 64 20 60 2b |e2 are m|arked `+|
|00000ed0| 20 27 2e 0d 20 20 20 20 | 20 20 20 20 20 20 4c 69 | '.. | Li|
|00000ee0| 6e 65 73 20 77 68 69 63 | 68 20 61 72 65 20 63 68 |nes whic|h are ch|
|00000ef0| 61 6e 67 65 64 20 66 72 | 6f 6d 20 6f 6e 65 20 66 |anged fr|om one f|
|00000f00| 69 6c 65 20 74 6f 20 74 | 68 65 20 6f 74 68 65 72 |ile to t|he other|
|00000f10| 20 20 61 72 65 0d 20 20 | 20 20 20 20 20 20 20 20 | are. | |
|00000f20| 6d 61 72 6b 65 64 20 69 | 6e 20 62 6f 74 68 20 66 |marked i|n both f|
|00000f30| 69 6c 65 73 20 77 69 74 | 68 20 60 21 20 27 2e 0d |iles wit|h `! '..|
|00000f40| 0d 20 20 20 20 20 20 20 | 20 20 20 43 68 61 6e 67 |. | Chang|
|00000f50| 65 73 20 77 68 69 63 68 | 20 6c 69 65 20 77 69 74 |es which| lie wit|
|00000f60| 68 69 6e 20 3c 63 6f 6e | 74 65 78 74 3e 20 6c 69 |hin <con|text> li|
|00000f70| 6e 65 73 20 6f 66 20 65 | 61 63 68 20 20 6f 74 68 |nes of e|ach oth|
|00000f80| 65 72 0d 20 20 20 20 20 | 20 20 20 20 20 61 72 65 |er. | are|
|00000f90| 20 20 67 72 6f 75 70 65 | 64 20 74 6f 67 65 74 68 | groupe|d togeth|
|00000fa0| 65 72 20 6f 6e 20 6f 75 | 74 70 75 74 2e 20 20 54 |er on ou|tput. T|
|00000fb0| 68 69 73 20 69 73 20 61 | 20 63 68 61 6e 67 65 20 |his is a| change |
|00000fc0| 66 72 6f 6d 0d 20 20 20 | 20 20 20 20 20 20 20 74 |from. | t|
|00000fd0| 68 65 20 70 72 65 76 69 | 6f 75 73 20 60 64 69 66 |he previ|ous `dif|
|00000fe0| 66 20 2d 63 27 20 62 75 | 74 20 74 68 65 20 72 65 |f -c' bu|t the re|
|00000ff0| 73 75 6c 74 69 6e 67 20 | 6f 75 74 70 75 74 20 69 |sulting |output i|
|00001000| 73 20 75 73 75 2d 0d 20 | 20 20 20 20 20 20 20 20 |s usu-. | |
|00001010| 20 61 6c 6c 79 20 6d 75 | 63 68 20 65 61 73 69 65 | ally mu|ch easie|
|00001020| 72 20 74 6f 20 69 6e 74 | 65 72 70 72 65 74 2e 0d |r to int|erpret..|
|00001030| 0d 20 20 20 20 20 2d 65 | 20 20 20 50 72 6f 64 75 |. -e| Produ|
|00001040| 63 65 20 61 20 73 63 72 | 69 70 74 20 6f 66 20 61 |ce a scr|ipt of a|
|00001050| 2c 20 63 2c 20 61 6e 64 | 20 64 20 63 6f 6d 6d 61 |, c, and| d comma|
|00001060| 6e 64 73 20 66 6f 72 20 | 74 68 65 20 65 64 69 74 |nds for |the edit|
|00001070| 6f 72 0d 20 20 20 20 20 | 20 20 20 20 20 65 64 2c |or. | ed,|
|00001080| 20 77 68 69 63 68 20 77 | 69 6c 6c 20 72 65 63 72 | which w|ill recr|
|00001090| 65 61 74 65 20 66 69 6c | 65 6e 61 6d 65 32 20 66 |eate fil|ename2 f|
|000010a0| 72 6f 6d 20 66 69 6c 65 | 6e 61 6d 65 31 2e 0d 0d |rom file|name1...|
|000010b0| 20 20 20 20 20 20 20 20 | 20 20 49 6e 20 63 6f 6e | | In con|
|000010c0| 6e 65 63 74 69 6f 6e 20 | 77 69 74 68 20 2d 65 2c |nection |with -e,|
|000010d0| 20 74 68 65 20 66 6f 6c | 6c 6f 77 69 6e 67 20 73 | the fol|lowing s|
|000010e0| 68 65 6c 6c 20 70 72 6f | 67 72 61 6d 20 20 6d 61 |hell pro|gram ma|
|000010f0| 79 0d 20 20 20 20 20 20 | 20 20 20 20 68 65 6c 70 |y. | help|
|00001100| 20 20 6d 61 69 6e 74 61 | 69 6e 20 20 6d 75 6c 74 | mainta|in mult|
|00001110| 69 70 6c 65 20 20 76 65 | 72 73 69 6f 6e 73 20 20 |iple ve|rsions |
|00001120| 6f 66 20 61 20 66 69 6c | 65 2e 20 20 4f 6e 6c 79 |of a fil|e. Only|
|00001130| 20 61 6e 0d 20 20 20 20 | 20 20 20 20 20 20 61 6e | an. | an|
|00001140| 63 65 73 74 72 61 6c 20 | 66 69 6c 65 20 28 24 31 |cestral |file ($1|
|00001150| 29 20 61 6e 64 20 61 20 | 63 68 61 69 6e 20 20 6f |) and a |chain o|
|00001160| 66 20 20 76 65 72 73 69 | 6f 6e 2d 74 6f 2d 76 65 |f versi|on-to-ve|
|00001170| 72 73 69 6f 6e 0d 20 20 | 20 20 20 20 20 20 20 20 |rsion. | |
|00001180| 65 64 20 73 63 72 69 70 | 74 73 20 28 24 32 2c 24 |ed scrip|ts ($2,$|
|00001190| 33 2c 2e 2e 2e 29 20 6d | 61 64 65 20 62 79 20 64 |3,...) m|ade by d|
|000011a0| 69 66 66 20 6e 65 65 64 | 20 62 65 20 6f 6e 20 68 |iff need| be on h|
|000011b0| 61 6e 64 2e 20 20 41 0d | 20 20 20 20 20 20 20 20 |and. A.| |
|000011c0| 20 20 60 6c 61 74 65 73 | 74 20 76 65 72 73 69 6f | `lates|t versio|
|000011d0| 6e 27 20 61 70 70 65 61 | 72 73 20 6f 6e 20 74 68 |n' appea|rs on th|
|000011e0| 65 20 73 74 61 6e 64 61 | 72 64 20 6f 75 74 70 75 |e standa|rd outpu|
|000011f0| 74 2e 0d 0d 20 20 20 20 | 20 20 20 20 20 20 20 20 |t... | |
|00001200| 20 20 20 28 73 68 69 66 | 74 3b 20 63 61 74 20 24 | (shif|t; cat $|
|00001210| 2a 3b 20 65 63 68 6f 20 | 27 31 2c 24 70 27 29 20 |*; echo |'1,$p') |
|00001220| 7c 20 65 64 20 2d 20 24 | 31 0d 0d 20 20 20 20 20 || ed - $|1.. |
|00001230| 20 20 20 20 20 45 78 74 | 72 61 20 63 6f 6d 6d 61 | Ext|ra comma|
|00001240| 6e 64 73 20 61 72 65 20 | 61 64 64 65 64 20 74 6f |nds are |added to|
|00001250| 20 74 68 65 20 6f 75 74 | 70 75 74 20 20 77 68 65 | the out|put whe|
|00001260| 6e 20 20 63 6f 6d 70 61 | 72 69 6e 67 0d 20 20 20 |n compa|ring. |
|00001270| 20 20 20 20 20 20 20 64 | 69 72 65 63 74 6f 72 69 | d|irectori|
|00001280| 65 73 20 20 77 69 74 68 | 20 2d 65 2c 20 73 6f 20 |es with| -e, so |
|00001290| 74 68 61 74 20 74 68 65 | 20 72 65 73 75 6c 74 20 |that the| result |
|000012a0| 69 73 20 61 20 73 68 20 | 73 63 72 69 70 74 0d 20 |is a sh |script. |
|000012b0| 20 20 20 20 20 20 20 20 | 20 66 6f 72 20 63 6f 6e | | for con|
|000012c0| 76 65 72 74 69 6e 67 20 | 74 65 78 74 20 66 69 6c |verting |text fil|
|000012d0| 65 73 20 77 68 69 63 68 | 20 61 72 65 20 63 6f 6d |es which| are com|
|000012e0| 6d 6f 6e 20 74 6f 20 20 | 74 68 65 20 20 74 77 6f |mon to |the two|
|000012f0| 0d 20 20 20 20 20 20 20 | 20 20 20 64 69 72 65 63 |. | direc|
|00001300| 74 6f 72 69 65 73 20 20 | 66 72 6f 6d 20 20 74 68 |tories |from th|
|00001310| 65 69 72 20 20 73 74 61 | 74 65 20 20 69 6e 20 64 |eir sta|te in d|
|00001320| 69 72 65 63 74 6f 72 79 | 31 20 74 6f 20 74 68 65 |irectory|1 to the|
|00001330| 69 72 0d 20 20 20 20 20 | 20 20 20 20 20 73 74 61 |ir. | sta|
|00001340| 74 65 20 69 6e 20 64 69 | 72 65 63 74 6f 72 79 32 |te in di|rectory2|
|00001350| 2e 0d 0d 20 20 20 20 20 | 2d 66 20 20 20 50 72 6f |... |-f Pro|
|00001360| 64 75 63 65 20 61 20 73 | 63 72 69 70 74 20 73 69 |duce a s|cript si|
|00001370| 6d 69 6c 61 72 20 74 6f | 20 74 68 61 74 20 6f 66 |milar to| that of|
|00001380| 20 2d 65 2c 20 6e 6f 74 | 20 75 73 65 66 75 6c 20 | -e, not| useful |
|00001390| 77 69 74 68 0d 20 20 20 | 20 20 20 20 20 20 20 65 |with. | e|
|000013a0| 64 2c 20 77 68 69 63 68 | 20 69 73 20 69 6e 20 74 |d, which| is in t|
|000013b0| 68 65 20 6f 70 70 6f 73 | 69 74 65 20 6f 72 64 65 |he oppos|ite orde|
|000013c0| 72 2e 0d 0d 20 20 20 20 | 20 2d 6e 20 20 20 50 72 |r... | -n Pr|
|000013d0| 6f 64 75 63 65 20 61 20 | 73 63 72 69 70 74 20 73 |oduce a |script s|
|000013e0| 69 6d 69 6c 61 72 20 74 | 6f 20 74 68 61 74 20 20 |imilar t|o that |
|000013f0| 6f 66 20 20 2d 65 2c 20 | 20 62 75 74 20 20 69 6e |of -e, | but in|
|00001400| 20 20 74 68 65 0d 0d 0d | 0d 53 75 6e 20 52 65 6c | the...|.Sun Rel|
|00001410| 65 61 73 65 20 34 2e 31 | 20 20 20 20 4c 61 73 74 |ease 4.1| Last|
|00001420| 20 63 68 61 6e 67 65 3a | 20 32 20 4f 63 74 6f 62 | change:| 2 Octob|
|00001430| 65 72 20 31 39 38 39 20 | 20 20 20 20 20 20 20 20 |er 1989 | |
|00001440| 20 20 20 20 20 20 20 20 | 20 32 0d 0d 0d 0d 0d 0d | | 2......|
|00001450| 44 49 46 46 28 31 29 20 | 20 20 20 20 20 20 20 20 |DIFF(1) | |
|00001460| 20 20 20 20 20 20 20 20 | 20 55 53 45 52 20 43 4f | | USER CO|
|00001470| 4d 4d 41 4e 44 53 20 20 | 20 20 20 20 20 20 20 20 |MMANDS | |
|00001480| 20 20 20 20 20 20 20 20 | 20 20 44 49 46 46 28 31 | | DIFF(1|
|00001490| 29 0d 0d 0d 0d 20 20 20 | 20 20 20 20 20 20 20 6f |).... | o|
|000014a0| 70 70 6f 73 69 74 65 20 | 20 6f 72 64 65 72 20 20 |pposite | order |
|000014b0| 61 6e 64 20 20 77 69 74 | 68 20 20 61 20 63 6f 75 |and wit|h a cou|
|000014c0| 6e 74 20 6f 66 20 63 68 | 61 6e 67 65 64 20 6c 69 |nt of ch|anged li|
|000014d0| 6e 65 73 20 6f 6e 0d 20 | 20 20 20 20 20 20 20 20 |nes on. | |
|000014e0| 20 65 61 63 68 20 69 6e | 73 65 72 74 20 6f 72 20 | each in|sert or |
|000014f0| 64 65 6c 65 74 65 20 63 | 6f 6d 6d 61 6e 64 2e 0d |delete c|ommand..|
|00001500| 0d 20 20 20 20 20 2d 68 | 20 20 20 44 6f 20 61 20 |. -h| Do a |
|00001510| 20 66 61 73 74 2c 20 20 | 68 61 6c 66 2d 68 65 61 | fast, |half-hea|
|00001520| 72 74 65 64 20 20 6a 6f | 62 2e 20 20 20 49 74 20 |rted jo|b. It |
|00001530| 20 77 6f 72 6b 73 20 20 | 6f 6e 6c 79 20 20 77 68 | works |only wh|
|00001540| 65 6e 0d 20 20 20 20 20 | 20 20 20 20 20 63 68 61 |en. | cha|
|00001550| 6e 67 65 64 20 20 73 74 | 72 65 74 63 68 65 73 20 |nged st|retches |
|00001560| 20 61 72 65 20 20 73 68 | 6f 72 74 20 20 61 6e 64 | are sh|ort and|
|00001570| 20 77 65 6c 6c 20 73 65 | 70 61 72 61 74 65 64 2c | well se|parated,|
|00001580| 20 62 75 74 0d 20 20 20 | 20 20 20 20 20 20 20 64 | but. | d|
|00001590| 6f 65 73 20 77 6f 72 6b | 20 6f 6e 20 66 69 6c 65 |oes work| on file|
|000015a0| 73 20 6f 66 20 75 6e 6c | 69 6d 69 74 65 64 20 6c |s of unl|imited l|
|000015b0| 65 6e 67 74 68 2e 0d 0d | 20 20 20 20 20 4f 70 74 |ength...| Opt|
|000015c0| 69 6f 6e 73 20 66 6f 72 | 20 74 68 65 20 73 65 63 |ions for| the sec|
|000015d0| 6f 6e 64 20 66 6f 72 6d | 20 6f 66 20 64 69 66 66 |ond form| of diff|
|000015e0| 20 61 72 65 20 61 73 20 | 66 6f 6c 6c 6f 77 73 3a | are as |follows:|
|000015f0| 0d 0d 20 20 20 20 20 2d | 44 73 74 72 69 6e 67 0d |.. -|Dstring.|
|00001600| 20 20 20 20 20 20 20 20 | 20 20 43 72 65 61 74 65 | | Create|
|00001610| 20 61 20 6d 65 72 67 65 | 64 20 76 65 72 73 69 6f | a merge|d versio|
|00001620| 6e 20 6f 66 20 66 69 6c | 65 6e 61 6d 65 31 20 61 |n of fil|ename1 a|
|00001630| 6e 64 20 20 66 69 6c 65 | 6e 61 6d 65 32 20 20 6f |nd file|name2 o|
|00001640| 6e 0d 20 20 20 20 20 20 | 20 20 20 20 74 68 65 20 |n. | the |
|00001650| 20 73 74 61 6e 64 61 72 | 64 20 20 6f 75 74 70 75 | standar|d outpu|
|00001660| 74 2c 20 20 77 69 74 68 | 20 20 43 20 20 70 72 65 |t, with| C pre|
|00001670| 70 72 6f 63 65 73 73 6f | 72 20 20 63 6f 6e 74 72 |processo|r contr|
|00001680| 6f 6c 73 0d 20 20 20 20 | 20 20 20 20 20 20 69 6e |ols. | in|
|00001690| 63 6c 75 64 65 64 20 73 | 6f 20 74 68 61 74 20 61 |cluded s|o that a|
|000016a0| 20 63 6f 6d 70 69 6c 61 | 74 69 6f 6e 20 6f 66 20 | compila|tion of |
|000016b0| 20 74 68 65 20 20 72 65 | 73 75 6c 74 20 20 77 69 | the re|sult wi|
|000016c0| 74 68 6f 75 74 0d 20 20 | 20 20 20 20 20 20 20 20 |thout. | |
|000016d0| 64 65 66 69 6e 69 6e 67 | 20 20 73 74 72 69 6e 67 |defining| string|
|000016e0| 20 20 69 73 20 65 71 75 | 69 76 61 6c 65 6e 74 20 | is equ|ivalent |
|000016f0| 74 6f 20 63 6f 6d 70 69 | 6c 69 6e 67 20 66 69 6c |to compi|ling fil|
|00001700| 65 6e 61 6d 65 31 2c 0d | 20 20 20 20 20 20 20 20 |ename1,.| |
|00001710| 20 20 77 68 69 6c 65 20 | 64 65 66 69 6e 69 6e 67 | while |defining|
|00001720| 20 73 74 72 69 6e 67 20 | 77 69 6c 6c 20 79 69 65 | string |will yie|
|00001730| 6c 64 20 66 69 6c 65 6e | 61 6d 65 32 2e 0d 0d 20 |ld filen|ame2... |
|00001740| 20 20 20 20 4f 70 74 69 | 6f 6e 73 20 77 68 65 6e | Opti|ons when|
|00001750| 20 63 6f 6d 70 61 72 69 | 6e 67 20 64 69 72 65 63 | compari|ng direc|
|00001760| 74 6f 72 69 65 73 20 61 | 72 65 3a 0d 0d 20 20 20 |tories a|re:.. |
|00001770| 20 20 2d 6c 20 20 20 4c | 6f 6e 67 20 6f 75 74 70 | -l L|ong outp|
|00001780| 75 74 20 20 66 6f 72 6d | 61 74 3b 20 20 65 61 63 |ut form|at; eac|
|00001790| 68 20 20 74 65 78 74 20 | 20 66 69 6c 65 20 20 64 |h text | file d|
|000017a0| 69 66 66 20 20 69 73 20 | 20 70 69 70 65 64 0d 20 |iff is | piped. |
|000017b0| 20 20 20 20 20 20 20 20 | 20 74 68 72 6f 75 67 68 | | through|
|000017c0| 20 20 70 72 28 31 56 29 | 20 20 74 6f 20 20 70 61 | pr(1V)| to pa|
|000017d0| 67 69 6e 61 74 65 20 69 | 74 2c 20 6f 74 68 65 72 |ginate i|t, other|
|000017e0| 20 64 69 66 66 65 72 65 | 6e 63 65 73 20 61 72 65 | differe|nces are|
|000017f0| 0d 20 20 20 20 20 20 20 | 20 20 20 72 65 6d 65 6d |. | remem|
|00001800| 62 65 72 65 64 20 61 6e | 64 20 73 75 6d 6d 61 72 |bered an|d summar|
|00001810| 69 7a 65 64 20 61 66 74 | 65 72 20 61 6c 6c 20 74 |ized aft|er all t|
|00001820| 65 78 74 20 20 66 69 6c | 65 20 20 64 69 66 66 65 |ext fil|e diffe|
|00001830| 72 2d 0d 20 20 20 20 20 | 20 20 20 20 20 65 6e 63 |r-. | enc|
|00001840| 65 73 20 61 72 65 20 72 | 65 70 6f 72 74 65 64 2e |es are r|eported.|
|00001850| 0d 0d 20 20 20 20 20 2d | 72 20 20 20 41 70 70 6c |.. -|r Appl|
|00001860| 79 20 64 69 66 66 20 72 | 65 63 75 72 73 69 76 65 |y diff r|ecursive|
|00001870| 6c 79 20 74 6f 20 63 6f | 6d 6d 6f 6e 20 73 75 62 |ly to co|mmon sub|
|00001880| 64 69 72 65 63 74 6f 72 | 69 65 73 20 65 6e 63 6f |director|ies enco|
|00001890| 75 6e 2d 0d 20 20 20 20 | 20 20 20 20 20 20 74 65 |un-. | te|
|000018a0| 72 65 64 2e 0d 0d 20 20 | 20 20 20 2d 73 20 20 20 |red... | -s |
|000018b0| 52 65 70 6f 72 74 20 66 | 69 6c 65 73 20 77 68 69 |Report f|iles whi|
|000018c0| 63 68 20 61 72 65 20 74 | 68 65 20 73 61 6d 65 2c |ch are t|he same,|
|000018d0| 20 20 77 68 69 63 68 20 | 20 61 72 65 20 20 6f 74 | which | are ot|
|000018e0| 68 65 72 77 69 73 65 0d | 20 20 20 20 20 20 20 20 |herwise.| |
|000018f0| 20 20 6e 6f 74 20 6d 65 | 6e 74 69 6f 6e 65 64 2e | not me|ntioned.|
|00001900| 0d 0d 20 20 20 20 20 2d | 53 6e 61 6d 65 0d 20 20 |.. -|Sname. |
|00001910| 20 20 20 20 20 20 20 20 | 53 74 61 72 74 20 61 20 | |Start a |
|00001920| 64 69 72 65 63 74 6f 72 | 79 20 64 69 66 66 20 69 |director|y diff i|
|00001930| 6e 20 74 68 65 20 20 6d | 69 64 64 6c 65 2c 20 20 |n the m|iddle, |
|00001940| 62 65 67 69 6e 6e 69 6e | 67 20 20 77 69 74 68 0d |beginnin|g with.|
|00001950| 20 20 20 20 20 20 20 20 | 20 20 66 69 6c 65 20 6e | | file n|
|00001960| 61 6d 65 2e 0d 0d 45 4e | 56 49 52 4f 4e 4d 45 4e |ame...EN|VIRONMEN|
|00001970| 54 0d 20 20 20 20 20 54 | 68 65 20 65 6e 76 69 72 |T. T|he envir|
|00001980| 6f 6e 6d 65 6e 74 20 76 | 61 72 69 61 62 6c 65 73 |onment v|ariables|
|00001990| 20 20 4c 43 5f 43 54 59 | 50 45 2c 20 20 4c 41 4e | LC_CTY|PE, LAN|
|000019a0| 47 2c 20 20 61 6e 64 20 | 20 4c 43 5f 64 65 66 61 |G, and | LC_defa|
|000019b0| 75 6c 74 0d 20 20 20 20 | 20 63 6f 6e 74 72 6f 6c |ult. | control|
|000019c0| 20 20 74 68 65 20 20 63 | 68 61 72 61 63 74 65 72 | the c|haracter|
|000019d0| 20 20 63 6c 61 73 73 69 | 66 69 63 61 74 69 6f 6e | classi|fication|
|000019e0| 20 74 68 72 6f 75 67 68 | 6f 75 74 20 64 69 66 66 | through|out diff|
|000019f0| 2e 20 20 4f 6e 0d 20 20 | 20 20 20 65 6e 74 72 79 |. On. | entry|
|00001a00| 20 74 6f 20 64 69 66 66 | 2c 20 74 68 65 73 65 20 | to diff|, these |
|00001a10| 65 6e 76 69 72 6f 6e 6d | 65 6e 74 20 76 61 72 69 |environm|ent vari|
|00001a20| 61 62 6c 65 73 20 20 61 | 72 65 20 20 63 68 65 63 |ables a|re chec|
|00001a30| 6b 65 64 20 20 69 6e 0d | 20 20 20 20 20 74 68 65 |ked in.| the|
|00001a40| 20 66 6f 6c 6c 6f 77 69 | 6e 67 20 6f 72 64 65 72 | followi|ng order|
|00001a50| 3a 20 4c 43 5f 43 54 59 | 50 45 2c 20 4c 41 4e 47 |: LC_CTY|PE, LANG|
|00001a60| 2c 20 61 6e 64 20 4c 43 | 5f 64 65 66 61 75 6c 74 |, and LC|_default|
|00001a70| 2e 20 20 57 68 65 6e 20 | 61 0d 20 20 20 20 20 76 |. When |a. v|
|00001a80| 61 6c 69 64 20 76 61 6c | 75 65 20 69 73 20 66 6f |alid val|ue is fo|
|00001a90| 75 6e 64 2c 20 72 65 6d | 61 69 6e 69 6e 67 20 20 |und, rem|aining |
|00001aa0| 65 6e 76 69 72 6f 6e 6d | 65 6e 74 20 20 76 61 72 |environm|ent var|
|00001ab0| 69 61 62 6c 65 73 20 20 | 66 6f 72 0d 20 20 20 20 |iables |for. |
|00001ac0| 20 63 68 61 72 61 63 74 | 65 72 20 20 63 6c 61 73 | charact|er clas|
|00001ad0| 73 69 66 69 63 61 74 69 | 6f 6e 20 20 61 72 65 20 |sificati|on are |
|00001ae0| 20 69 67 6e 6f 72 65 64 | 2e 20 20 46 6f 72 20 65 | ignored|. For e|
|00001af0| 78 61 6d 70 6c 65 2c 20 | 61 20 6e 65 77 0d 20 20 |xample, |a new. |
|00001b00| 20 20 20 73 65 74 74 69 | 6e 67 20 66 6f 72 20 4c | setti|ng for L|
|00001b10| 41 4e 47 20 64 6f 65 73 | 20 6e 6f 74 20 6f 76 65 |ANG does| not ove|
|00001b20| 72 72 69 64 65 20 74 68 | 65 20 63 75 72 72 65 6e |rride th|e curren|
|00001b30| 74 20 76 61 6c 69 64 20 | 63 68 61 72 61 63 2d 0d |t valid |charac-.|
|00001b40| 20 20 20 20 20 74 65 72 | 20 20 63 6c 61 73 73 69 | ter| classi|
|00001b50| 66 69 63 61 74 69 6f 6e | 20 20 72 75 6c 65 73 20 |fication| rules |
|00001b60| 20 6f 66 20 20 4c 43 5f | 43 54 59 50 45 2e 20 20 | of LC_|CTYPE. |
|00001b70| 20 57 68 65 6e 20 6e 6f | 6e 65 20 6f 66 20 74 68 | When no|ne of th|
|00001b80| 65 0d 20 20 20 20 20 76 | 61 6c 75 65 73 20 69 73 |e. v|alues is|
|00001b90| 20 76 61 6c 69 64 2c 20 | 74 68 65 20 73 68 65 6c | valid, |the shel|
|00001ba0| 6c 20 63 68 61 72 61 63 | 74 65 72 20 63 6c 61 73 |l charac|ter clas|
|00001bb0| 73 69 66 69 63 61 74 69 | 6f 6e 20 64 65 66 61 75 |sificati|on defau|
|00001bc0| 6c 74 73 0d 20 20 20 20 | 20 74 6f 20 74 68 65 20 |lts. | to the |
|00001bd0| 50 4f 53 49 58 2e 31 20 | 22 43 22 20 6c 6f 63 61 |POSIX.1 |"C" loca|
|00001be0| 6c 65 2e 0d 0d 46 49 4c | 45 53 0d 20 20 20 20 20 |le...FIL|ES. |
|00001bf0| 2f 74 6d 70 2f 64 3f 3f | 3f 3f 3f 0d 20 20 20 20 |/tmp/d??|???. |
|00001c00| 20 2f 75 73 72 2f 6c 69 | 62 2f 64 69 66 66 68 20 | /usr/li|b/diffh |
|00001c10| 20 20 20 20 20 66 6f 72 | 20 2d 68 0d 0d 53 45 45 | for| -h..SEE|
|00001c20| 20 41 4c 53 4f 0d 20 20 | 20 20 20 63 63 28 31 56 | ALSO. | cc(1V|
|00001c30| 29 2c 20 63 6d 70 28 31 | 29 2c 20 63 6f 6d 6d 28 |), cmp(1|), comm(|
|00001c40| 31 29 2c 20 63 70 70 28 | 31 29 2c 20 64 69 66 66 |1), cpp(|1), diff|
|00001c50| 33 28 31 56 29 2c 20 20 | 65 64 28 31 29 2c 20 20 |3(1V), |ed(1), |
|00001c60| 70 72 28 31 56 29 2c 0d | 20 20 20 20 20 6c 6f 63 |pr(1V),.| loc|
|00001c70| 61 6c 65 28 35 29 2c 20 | 69 73 6f 5f 38 38 35 39 |ale(5), |iso_8859|
|00001c80| 5f 31 28 37 29 0d 0d 0d | 0d 53 75 6e 20 52 65 6c |_1(7)...|.Sun Rel|
|00001c90| 65 61 73 65 20 34 2e 31 | 20 20 20 20 4c 61 73 74 |ease 4.1| Last|
|00001ca0| 20 63 68 61 6e 67 65 3a | 20 32 20 4f 63 74 6f 62 | change:| 2 Octob|
|00001cb0| 65 72 20 31 39 38 39 20 | 20 20 20 20 20 20 20 20 |er 1989 | |
|00001cc0| 20 20 20 20 20 20 20 20 | 20 33 0d 0d 0d 0d 0d 0d | | 3......|
|00001cd0| 0d 44 49 46 46 28 31 29 | 20 20 20 20 20 20 20 20 |.DIFF(1)| |
|00001ce0| 20 20 20 20 20 20 20 20 | 20 20 55 53 45 52 20 43 | | USER C|
|00001cf0| 4f 4d 4d 41 4e 44 53 20 | 20 20 20 20 20 20 20 20 |OMMANDS | |
|00001d00| 20 20 20 20 20 20 20 20 | 20 20 20 44 49 46 46 28 | | DIFF(|
|00001d10| 31 29 0d 0d 0d 0d 44 49 | 41 47 4e 4f 53 54 49 43 |1)....DI|AGNOSTIC|
|00001d20| 53 0d 20 20 20 20 20 45 | 78 69 74 20 73 74 61 74 |S. E|xit stat|
|00001d30| 75 73 20 69 73 20 30 20 | 66 6f 72 20 6e 6f 20 64 |us is 0 |for no d|
|00001d40| 69 66 66 65 72 65 6e 63 | 65 73 2c 20 31 20 66 6f |ifferenc|es, 1 fo|
|00001d50| 72 20 73 6f 6d 65 20 64 | 69 66 66 65 72 65 6e 63 |r some d|ifferenc|
|00001d60| 65 73 2c 0d 20 20 20 20 | 20 32 20 66 6f 72 20 74 |es,. | 2 for t|
|00001d70| 72 6f 75 62 6c 65 2e 0d | 0d 20 20 20 20 20 4d 69 |rouble..|. Mi|
|00001d80| 73 73 69 6e 67 20 6e 65 | 77 6c 69 6e 65 20 61 74 |ssing ne|wline at|
|00001d90| 20 65 6e 64 20 6f 66 20 | 66 69 6c 65 58 0d 20 20 | end of |fileX. |
|00001da0| 20 20 20 20 20 20 20 20 | 49 6e 64 69 63 61 74 65 | |Indicate|
|00001db0| 73 20 74 68 61 74 20 74 | 68 65 20 6c 61 73 74 20 |s that t|he last |
|00001dc0| 6c 69 6e 65 20 6f 66 20 | 66 69 6c 65 20 58 20 64 |line of |file X d|
|00001dd0| 69 64 20 6e 6f 74 20 20 | 68 61 76 65 20 20 61 0d |id not |have a.|
|00001de0| 20 20 20 20 20 20 20 20 | 20 20 4e 45 57 4c 49 4e | | NEWLIN|
|00001df0| 45 2e 20 20 49 66 20 20 | 74 68 65 20 20 6c 69 6e |E. If |the lin|
|00001e00| 65 73 20 20 61 72 65 20 | 20 64 69 66 66 65 72 65 |es are | differe|
|00001e10| 6e 74 2c 20 20 74 68 65 | 79 20 77 69 6c 6c 20 62 |nt, the|y will b|
|00001e20| 65 0d 20 20 20 20 20 20 | 20 20 20 20 66 6c 61 67 |e. | flag|
|00001e30| 67 65 64 20 61 6e 64 20 | 6f 75 74 70 75 74 2c 20 |ged and |output, |
|00001e40| 61 6c 74 68 6f 75 67 68 | 20 74 68 65 20 6f 75 74 |although| the out|
|00001e50| 70 75 74 20 20 77 69 6c | 6c 20 20 73 65 65 6d 20 |put wil|l seem |
|00001e60| 20 74 6f 0d 20 20 20 20 | 20 20 20 20 20 20 69 6e | to. | in|
|00001e70| 64 69 63 61 74 65 20 74 | 68 65 79 20 61 72 65 20 |dicate t|hey are |
|00001e80| 74 68 65 20 73 61 6d 65 | 2e 0d 0d 42 55 47 53 0d |the same|...BUGS.|
|00001e90| 20 20 20 20 20 45 64 69 | 74 69 6e 67 20 73 63 72 | Edi|ting scr|
|00001ea0| 69 70 74 73 20 70 72 6f | 64 75 63 65 64 20 75 6e |ipts pro|duced un|
|00001eb0| 64 65 72 20 74 68 65 20 | 2d 65 20 6f 72 20 2d 66 |der the |-e or -f|
|00001ec0| 20 6f 70 74 69 6f 6e 20 | 61 72 65 20 6e 61 69 76 | option |are naiv|
|00001ed0| 65 0d 20 20 20 20 20 61 | 62 6f 75 74 20 63 72 65 |e. a|bout cre|
|00001ee0| 61 74 69 6e 67 20 6c 69 | 6e 65 73 20 63 6f 6e 73 |ating li|nes cons|
|00001ef0| 69 73 74 69 6e 67 20 6f | 66 20 61 20 73 69 6e 67 |isting o|f a sing|
|00001f00| 6c 65 20 60 2e 27 2e 0d | 0d 20 20 20 20 20 57 68 |le `.'..|. Wh|
|00001f10| 65 6e 20 63 6f 6d 70 61 | 72 69 6e 67 20 64 69 72 |en compa|ring dir|
|00001f20| 65 63 74 6f 72 69 65 73 | 20 77 69 74 68 20 74 68 |ectories| with th|
|00001f30| 65 20 2d 62 2c 20 2d 77 | 2c 20 20 6f 72 20 20 2d |e -b, -w|, or -|
|00001f40| 69 20 20 6f 70 74 69 6f | 6e 73 0d 20 20 20 20 20 |i optio|ns. |
|00001f50| 73 70 65 63 69 66 69 65 | 64 2c 20 20 64 69 66 66 |specifie|d, diff|
|00001f60| 20 66 69 72 73 74 20 63 | 6f 6d 70 61 72 65 73 20 | first c|ompares |
|00001f70| 74 68 65 20 66 69 6c 65 | 73 20 28 61 73 20 69 6e |the file|s (as in|
|00001f80| 20 63 6d 70 28 31 29 2c | 20 61 6e 64 0d 20 20 20 | cmp(1),| and. |
|00001f90| 20 20 74 68 65 6e 20 72 | 75 6e 73 20 74 68 65 20 | then r|uns the |
|00001fa0| 72 65 67 75 6c 61 72 20 | 64 69 66 66 20 61 6c 67 |regular |diff alg|
|00001fb0| 6f 72 69 74 68 6d 20 69 | 66 20 74 68 65 79 20 61 |orithm i|f they a|
|00001fc0| 72 65 20 6e 6f 74 20 20 | 65 71 75 61 6c 2e 0d 20 |re not |equal.. |
|00001fd0| 20 20 20 20 54 68 69 73 | 20 20 6d 61 79 20 20 63 | This| may c|
|00001fe0| 61 75 73 65 20 20 61 20 | 20 73 6d 61 6c 6c 20 20 |ause a | small |
|00001ff0| 61 6d 6f 75 6e 74 20 6f | 66 20 73 70 75 72 69 6f |amount o|f spurio|
|00002000| 75 73 20 6f 75 74 70 75 | 74 20 69 66 20 74 68 65 |us outpu|t if the|
|00002010| 0d 20 20 20 20 20 66 69 | 6c 65 73 20 74 68 65 6e |. fi|les then|
|00002020| 20 74 75 72 6e 20 6f 75 | 74 20 74 6f 20 62 65 20 | turn ou|t to be |
|00002030| 69 64 65 6e 74 69 63 61 | 6c 20 62 65 63 61 75 73 |identica|l becaus|
|00002040| 65 20 74 68 65 20 6f 6e | 6c 79 20 64 69 66 66 65 |e the on|ly diffe|
|00002050| 72 2d 0d 20 20 20 20 20 | 65 6e 63 65 73 20 61 72 |r-. |ences ar|
|00002060| 65 20 69 6e 73 69 67 6e | 69 66 69 63 61 6e 74 20 |e insign|ificant |
|00002070| 62 6c 61 6e 6b 20 73 74 | 72 69 6e 67 20 6f 72 20 |blank st|ring or |
|00002080| 63 61 73 65 20 64 69 66 | 66 65 72 65 6e 63 65 73 |case dif|ferences|
|00002090| 2e 0d 0d 20 20 20 20 20 | 54 68 65 20 2d 44 20 6f |... |The -D o|
|000020a0| 70 74 69 6f 6e 20 69 67 | 6e 6f 72 65 73 20 65 78 |ption ig|nores ex|
|000020b0| 69 73 74 69 6e 67 20 70 | 72 65 70 72 6f 63 65 73 |isting p|reproces|
|000020c0| 73 6f 72 20 63 6f 6e 74 | 72 6f 6c 73 20 69 6e 20 |sor cont|rols in |
|000020d0| 20 74 68 65 0d 20 20 20 | 20 20 73 6f 75 72 63 65 | the. | source|
|000020e0| 20 20 66 69 6c 65 73 2c | 20 20 61 6e 64 20 20 63 | files,| and c|
|000020f0| 61 6e 20 67 65 6e 65 72 | 61 74 65 20 23 69 66 64 |an gener|ate #ifd|
|00002100| 65 66 73 27 73 20 77 69 | 74 68 20 6f 76 65 72 6c |efs's wi|th overl|
|00002110| 61 70 70 69 6e 67 0d 20 | 20 20 20 20 73 63 6f 70 |apping. | scop|
|00002120| 65 2e 20 20 54 68 65 20 | 6f 75 74 70 75 74 20 73 |e. The |output s|
|00002130| 68 6f 75 6c 64 20 62 65 | 20 63 68 65 63 6b 65 64 |hould be| checked|
|00002140| 20 62 79 20 68 61 6e 64 | 2c 20 6f 72 20 72 75 6e | by hand|, or run|
|00002150| 20 74 68 72 6f 75 67 68 | 0d 20 20 20 20 20 60 63 | through|. `c|
|00002160| 63 20 20 2d 45 27 20 20 | 28 73 65 65 20 20 63 63 |c -E' |(see cc|
|00002170| 28 31 56 29 29 20 20 61 | 6e 64 20 20 74 68 65 6e |(1V)) a|nd then|
|00002180| 20 20 64 69 66 66 65 64 | 20 77 69 74 68 20 74 68 | diffed| with th|
|00002190| 65 20 6f 72 69 67 69 6e | 61 6c 0d 20 20 20 20 20 |e origin|al. |
|000021a0| 73 6f 75 72 63 65 20 66 | 69 6c 65 73 2e 20 20 44 |source f|iles. D|
|000021b0| 69 73 63 72 65 70 61 6e | 63 69 65 73 20 72 65 76 |iscrepan|cies rev|
|000021c0| 65 61 6c 65 64 20 20 73 | 68 6f 75 6c 64 20 20 62 |ealed s|hould b|
|000021d0| 65 20 20 63 6f 72 72 65 | 63 74 65 64 0d 20 20 20 |e corre|cted. |
|000021e0| 20 20 62 65 66 6f 72 65 | 20 63 6f 6d 70 69 6c 61 | before| compila|
|000021f0| 74 69 6f 6e 2e 0d 0d 0d | 0d 0d 0d 0d 0d 0d 0d 0d |tion....|........|
|00002200| 0d 0d 0d 0d 0d 0d 0d 0d | 0d 0d 0d 0d 0d 0d 0d 0d |........|........|
|00002210| 0d 0d 53 75 6e 20 52 65 | 6c 65 61 73 65 20 34 2e |..Sun Re|lease 4.|
|00002220| 31 20 20 20 20 4c 61 73 | 74 20 63 68 61 6e 67 65 |1 Las|t change|
|00002230| 3a 20 32 20 4f 63 74 6f | 62 65 72 20 31 39 38 39 |: 2 Octo|ber 1989|
|00002240| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 20 20 20 | | |
|00002250| 20 20 34 0d 0d 0d 0d 45 | 6e 74 65 72 20 55 6e 69 | 4....E|nter Uni|
|00002260| 78 20 63 6f 6d 6d 61 6e | 64 20 6c 69 6e 65 3a 0d |x comman|d line:.|
|00002270| 0d 55 73 61 67 65 3a 20 | 64 69 66 66 20 5b 2d 23 |.Usage: |diff [-#|
|00002280| 5d 20 5b 2d 61 62 42 63 | 64 65 66 68 48 69 6c 6e |] [-abBc|defhHiln|
|00002290| 4e 70 72 73 74 54 75 76 | 77 5d 20 5b 2d 43 20 6c |NprstTuv|w] [-C l|
|000022a0| 69 6e 65 73 5d 20 5b 2d | 46 20 72 65 67 65 78 70 |ines] [-|F regexp|
|000022b0| 5d 20 5b 2d 49 20 72 65 | 67 65 78 70 5d 0d 20 20 |] [-I re|gexp]. |
|000022c0| 20 20 20 20 20 5b 2d 4c | 20 6c 61 62 65 6c 20 5b | [-L| label [|
|000022d0| 2d 4c 20 6c 61 62 65 6c | 5d 5d 20 5b 2d 53 20 66 |-L label|]] [-S f|
|000022e0| 69 6c 65 5d 20 5b 2d 44 | 20 73 79 6d 62 6f 6c 5d |ile] [-D| symbol]|
|000022f0| 20 5b 2b 69 67 6e 6f 72 | 65 2d 62 6c 61 6e 6b 2d | [+ignor|e-blank-|
|00002300| 6c 69 6e 65 73 5d 0d 20 | 20 20 20 20 20 20 5b 2b |lines]. | [+|
|00002310| 63 6f 6e 74 65 78 74 5b | 3d 6c 69 6e 65 73 5d 5d |context[|=lines]]|
|00002320| 20 5b 2b 75 6e 69 66 69 | 65 64 5b 3d 6c 69 6e 65 | [+unifi|ed[=line|
|00002330| 73 5d 5d 20 5b 2b 69 66 | 64 65 66 3d 73 79 6d 62 |s]] [+if|def=symb|
|00002340| 6f 6c 5d 0d 20 20 20 20 | 20 20 20 5b 2b 73 68 6f |ol]. | [+sho|
|00002350| 77 2d 66 75 6e 63 74 69 | 6f 6e 2d 6c 69 6e 65 3d |w-functi|on-line=|
|00002360| 72 65 67 65 78 70 5d 0d | 20 20 20 20 20 20 20 5b |regexp].| [|
|00002370| 2b 73 70 65 65 64 2d 6c | 61 72 67 65 2d 66 69 6c |+speed-l|arge-fil|
|00002380| 65 73 5d 20 5b 2b 69 67 | 6e 6f 72 65 2d 6d 61 74 |es] [+ig|nore-mat|
|00002390| 63 68 69 6e 67 2d 6c 69 | 6e 65 73 3d 72 65 67 65 |ching-li|nes=rege|
|000023a0| 78 70 5d 20 5b 2b 6e 65 | 77 2d 66 69 6c 65 5d 0d |xp] [+ne|w-file].|
|000023b0| 20 20 20 20 20 20 20 5b | 2b 69 6e 69 74 69 61 6c | [|+initial|
|000023c0| 2d 74 61 62 5d 20 5b 2b | 73 74 61 72 74 69 6e 67 |-tab] [+|starting|
|000023d0| 2d 66 69 6c 65 3d 66 69 | 6c 65 5d 20 5b 2b 74 65 |-file=fi|le] [+te|
|000023e0| 78 74 5d 20 5b 2b 61 6c | 6c 2d 74 65 78 74 5d 20 |xt] [+al|l-text] |
|000023f0| 5b 2b 61 73 63 69 69 5d | 0d 20 20 20 20 20 20 20 |[+ascii]|. |
|00002400| 5b 2b 6d 69 6e 69 6d 61 | 6c 5d 20 5b 2b 69 67 6e |[+minima|l] [+ign|
|00002410| 6f 72 65 2d 73 70 61 63 | 65 2d 63 68 61 6e 67 65 |ore-spac|e-change|
|00002420| 5d 20 5b 2b 65 64 5d 20 | 5b 2b 72 65 76 65 72 73 |] [+ed] |[+revers|
|00002430| 65 64 2d 65 64 5d 20 5b | 2b 69 67 6e 6f 72 65 2d |ed-ed] [|+ignore-|
|00002440| 63 61 73 65 5d 0d 20 20 | 20 20 20 20 20 5b 2b 70 |case]. | [+p|
|00002450| 72 69 6e 74 5d 20 5b 2b | 72 63 73 5d 20 5b 2b 73 |rint] [+|rcs] [+s|
|00002460| 68 6f 77 2d 63 2d 66 75 | 6e 63 74 69 6f 6e 5d 20 |how-c-fu|nction] |
|00002470| 5b 2b 62 69 6e 61 72 79 | 5d 20 5b 2b 62 72 69 65 |[+binary|] [+brie|
|00002480| 66 5d 20 5b 2b 72 65 63 | 75 72 73 69 76 65 5d 0d |f] [+rec|ursive].|
|00002490| 20 20 20 20 20 20 20 5b | 2b 72 65 70 6f 72 74 2d | [|+report-|
|000024a0| 69 64 65 6e 74 69 63 61 | 6c 2d 66 69 6c 65 73 5d |identica|l-files]|
|000024b0| 20 5b 2b 65 78 70 61 6e | 64 2d 74 61 62 73 5d 20 | [+expan|d-tabs] |
|000024c0| 5b 2b 69 67 6e 6f 72 65 | 2d 61 6c 6c 2d 73 70 61 |[+ignore|-all-spa|
|000024d0| 63 65 5d 0d 20 20 20 20 | 20 20 20 5b 2b 66 69 6c |ce]. | [+fil|
|000024e0| 65 2d 6c 61 62 65 6c 3d | 6c 61 62 65 6c 20 5b 2b |e-label=|label [+|
|000024f0| 66 69 6c 65 2d 6c 61 62 | 65 6c 3d 6c 61 62 65 6c |file-lab|el=label|
|00002500| 5d 5d 20 5b 2b 76 65 72 | 73 69 6f 6e 5d 20 70 61 |]] [+ver|sion] pa|
|00002510| 74 68 31 20 70 61 74 68 | 32 0d 0d 00 00 00 00 00 |th1 path|2.......|
|00002520| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00002530| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00002540| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00002550| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00002560| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00002570| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00002580| 00 00 01 00 00 00 07 80 | 00 00 06 80 00 00 00 45 |........|.......E|
|00002590| 44 42 53 54 00 00 01 9e | 44 42 57 53 00 00 01 aa |DBST....|DBWS....|
|000025a0| 43 52 45 4c 00 02 01 b6 | 44 42 55 47 00 02 01 da |CREL....|DBUG....|
|000025b0| 09 44 69 66 66 20 48 65 | 6c 70 02 00 00 00 54 45 |.Diff He|lp....TE|
|000025c0| 58 54 41 4c 46 41 01 00 | 00 9f 00 00 00 00 00 00 |XTALFA..|........|
|000025d0| 00 00 54 45 58 54 41 4c | 46 41 01 00 00 9f 00 00 |..TEXTAL|FA......|
|000025e0| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|000025f0| 00 00 aa 8f aa d3 00 00 | 24 9b 00 00 07 c5 36 60 |........|$.....6`|
|00002600| 00 00 ff ff 00 00 03 f4 | 00 90 36 5c 00 00 ff ff |........|..6\....|
|00002610| 00 00 07 7e 00 90 36 48 | 00 00 ff ff 00 00 0f aa |...~..6H|........|
|00002620| 00 90 36 44 00 02 ff ff | 00 01 2b f4 00 90 35 94 |..6D....|..+...5.|
|00002630| 00 03 ff ff 00 04 1a e6 | 00 90 35 4c 00 04 ff ff |........|..5L....|
|00002640| 00 05 16 6a 00 00 00 00 | 00 01 ff ff 14 01 88 f8 |...j....|........|
|00002650| 00 90 36 10 00 00 ff ff | 00 04 91 f0 00 90 35 b8 |..6.....|......5.|
|00002660| 00 00 ff ff 00 00 35 ce | 00 90 36 38 00 00 ff ff |......5.|..68....|
|00002670| 00 00 2b c2 00 90 34 ac | 00 00 ff ff 00 04 a8 be |..+...4.|........|
|00002680| 00 00 06 30 00 eb 26 2a | 00 00 00 c4 00 00 00 c8 |...0..&*|........|
|00002690| 00 00 00 00 00 00 00 e1 | 00 00 00 01 00 00 00 e1 |........|........|
|000026a0| 00 00 00 0f 00 00 00 ea | 00 00 00 00 00 00 00 ea |........|........|
|000026b0| 00 00 00 0c 00 00 00 f0 | 00 00 00 01 00 00 00 f0 |........|........|
|000026c0| 00 00 00 0f 00 00 00 f9 | 00 00 00 00 00 00 00 f9 |........|........|
|000026d0| 00 00 00 0c 00 00 01 12 | 00 00 00 01 00 00 01 12 |........|........|
|000026e0| 00 00 00 0f 00 00 01 18 | 00 00 00 00 00 00 01 18 |........|........|
|000026f0| 00 00 00 0c 00 00 01 1c | 00 00 00 01 00 00 01 1c |........|........|
|00002700| 00 00 00 0f 00 00 01 25 | 00 00 00 00 00 00 01 25 |.......%|.......%|
|00002710| 00 00 00 0c 00 00 01 26 | 00 00 00 01 00 00 01 26 |.......&|.......&|
|00002720| 00 00 00 0f 00 00 01 2f | 00 00 00 00 00 00 01 2f |......./|......./|
|00002730| 00 00 00 0c 00 00 01 84 | 00 00 00 01 00 00 01 84 |........|........|
|00002740| 00 00 00 0f 00 00 01 88 | 00 00 00 00 00 00 01 88 |........|........|
|00002750| 00 00 00 0c 00 00 01 8c | 00 00 00 01 00 00 01 8c |........|........|
|00002760| 00 00 00 0f 00 00 01 96 | 00 00 00 00 00 00 01 96 |........|........|
|00002770| 00 00 00 0c 00 00 01 97 | 00 00 00 01 00 00 01 97 |........|........|
|00002780| 00 00 00 0f 00 00 01 a1 | 00 00 00 00 00 00 01 a1 |........|........|
|00002790| 00 00 00 0c 00 00 01 be | 00 00 00 01 00 00 01 be |........|........|
|000027a0| 00 00 00 0f 00 00 01 ca | 00 00 00 00 00 00 01 ca |........|........|
|000027b0| 00 00 00 0c 00 00 03 53 | 00 00 00 01 00 00 03 53 |.......S|.......S|
|000027c0| 00 00 00 0f 00 00 03 5c | 00 00 00 00 00 00 03 5c |.......\|.......\|
|000027d0| 00 00 00 0c 00 00 03 61 | 00 00 00 01 00 00 03 61 |.......a|.......a|
|000027e0| 00 00 00 0f 00 00 03 6a | 00 00 00 00 00 00 03 6a |.......j|.......j|
|000027f0| 00 00 00 0c 00 00 03 d1 | 00 00 00 01 00 00 03 d1 |........|........|
|00002800| 00 00 00 0f 00 00 03 da | 00 00 00 00 00 00 03 da |........|........|
|00002810| 00 00 00 0c 00 00 04 39 | 00 00 00 01 00 00 04 39 |.......9|.......9|
|00002820| 00 00 00 0f 00 00 04 42 | 00 00 00 00 00 00 04 42 |.......B|.......B|
|00002830| 00 00 00 0c 00 00 04 e2 | 00 00 00 01 00 00 04 e2 |........|........|
|00002840| 00 00 00 0f 00 00 04 e4 | 00 00 00 00 00 00 04 e4 |........|........|
|00002850| 00 00 00 0c 00 00 04 e7 | 00 00 00 01 00 00 04 e7 |........|........|
|00002860| 00 00 00 0f 00 00 04 e9 | 00 00 00 00 00 00 04 e9 |........|........|
|00002870| 00 00 00 0c 00 00 04 ea | 00 00 00 01 00 00 04 ea |........|........|
|00002880| 00 00 00 0f 00 00 04 ec | 00 00 00 00 00 00 04 ec |........|........|
|00002890| 00 00 00 0c 00 00 04 f7 | 00 00 00 01 00 00 04 f7 |........|........|
|000028a0| 00 00 00 0f 00 00 04 f9 | 00 00 00 00 00 00 04 f9 |........|........|
|000028b0| 00 00 00 0c 00 00 04 fa | 00 00 00 01 00 00 04 fa |........|........|
|000028c0| 00 00 00 0f 00 00 04 fc | 00 00 00 00 00 00 04 fc |........|........|
|000028d0| 00 00 00 0c 00 00 04 ff | 00 00 00 01 00 00 04 ff |........|........|
|000028e0| 00 00 00 0f 00 00 05 01 | 00 00 00 00 00 00 05 01 |........|........|
|000028f0| 00 00 00 0c 00 00 05 0c | 00 00 00 01 00 00 05 0c |........|........|
|00002900| 00 00 00 0f 00 00 05 0e | 00 00 00 00 00 00 05 0e |........|........|
|00002910| 00 00 00 0c 00 00 05 0f | 00 00 00 01 00 00 05 0f |........|........|
|00002920| 00 00 00 0f 00 00 05 11 | 00 00 00 00 00 00 05 11 |........|........|
|00002930| 00 00 00 0c 00 00 05 14 | 00 00 00 01 00 00 05 14 |........|........|
|00002940| 00 00 00 0f 00 00 05 16 | 00 00 00 00 00 00 05 16 |........|........|
|00002950| 00 00 00 0c 00 00 05 17 | 00 00 00 01 00 00 05 17 |........|........|
|00002960| 00 00 00 0f 00 00 05 19 | 00 00 00 00 00 00 05 19 |........|........|
|00002970| 00 00 00 0c 00 00 05 53 | 00 00 00 01 00 00 05 53 |.......S|.......S|
|00002980| 00 00 00 0f 00 00 05 5c | 00 00 00 00 00 00 05 5c |.......\|.......\|
|00002990| 00 00 00 0c 00 00 05 68 | 00 00 00 01 00 00 05 68 |.......h|.......h|
|000029a0| 00 00 00 0f 00 00 05 71 | 00 00 00 00 00 00 05 71 |.......q|.......q|
|000029b0| 00 00 00 0c 00 00 05 a4 | 00 00 00 01 00 00 05 a4 |........|........|
|000029c0| 00 00 00 0f 00 00 05 ad | 00 00 00 00 00 00 05 ad |........|........|
|000029d0| 00 00 00 0c 00 00 06 14 | 00 00 00 01 00 00 06 14 |........|........|
|000029e0| 00 00 00 0f 00 00 06 1d | 00 00 00 00 00 00 06 1d |........|........|
|000029f0| 00 00 00 0c 00 00 06 28 | 00 00 00 01 00 00 06 28 |.......(|.......(|
|00002a00| 00 00 00 0f 00 00 06 31 | 00 00 00 00 00 00 06 31 |.......1|.......1|
|00002a10| 00 00 00 0c 00 00 06 58 | 00 00 00 01 00 00 06 58 |.......X|.......X|
|00002a20| 00 00 00 0f 00 00 06 5a | 00 00 00 00 00 00 06 5a |.......Z|.......Z|
|00002a30| 00 00 00 0c 00 00 06 5e | 00 00 00 01 00 00 06 5e |.......^|.......^|
|00002a40| 00 00 00 0f 00 00 06 60 | 00 00 00 00 00 00 06 60 |.......`|.......`|
|00002a50| 00 00 00 0c 00 00 06 6a | 00 00 00 01 00 00 06 6a |.......j|.......j|
|00002a60| 00 00 00 0f 00 00 06 6c | 00 00 00 00 00 00 06 6c |.......l|.......l|
|00002a70| 00 00 00 0c 00 00 06 6f | 00 00 00 01 00 00 06 6f |.......o|.......o|
|00002a80| 00 00 00 0f 00 00 06 71 | 00 00 00 00 00 00 06 71 |.......q|.......q|
|00002a90| 00 00 00 0c 00 00 0d fc | 00 00 00 01 00 00 0d fc |........|........|
|00002aa0| 00 00 00 0f 00 00 0e 05 | 00 00 00 00 00 00 0e 05 |........|........|
|00002ab0| 00 00 00 0c 00 00 0e 39 | 00 00 00 01 00 00 0e 39 |.......9|.......9|
|00002ac0| 00 00 00 0f 00 00 0e 42 | 00 00 00 00 00 00 0e 42 |.......B|.......B|
|00002ad0| 00 00 00 0c 00 00 10 15 | 00 00 00 01 00 00 10 15 |........|........|
|00002ae0| 00 00 00 0f 00 00 10 1e | 00 00 00 00 00 00 10 1e |........|........|
|00002af0| 00 00 00 0c 00 00 10 24 | 00 00 00 01 00 00 10 24 |.......$|.......$|
|00002b00| 00 00 00 0f 00 00 10 2d | 00 00 00 00 00 00 10 2d |.......-|.......-|
|00002b10| 00 00 00 0c 00 00 12 9f | 00 00 00 01 00 00 12 9f |........|........|
|00002b20| 00 00 00 0f 00 00 12 a9 | 00 00 00 00 00 00 12 a9 |........|........|
|00002b30| 00 00 00 0c 00 00 12 c6 | 00 00 00 01 00 00 12 c6 |........|........|
|00002b40| 00 00 00 0f 00 00 12 d0 | 00 00 00 00 00 00 12 d0 |........|........|
|00002b50| 00 00 00 0c 00 00 15 79 | 00 00 00 01 00 00 15 79 |.......y|.......y|
|00002b60| 00 00 00 0f 00 00 15 7f | 00 00 00 00 00 00 15 7f |........|........|
|00002b70| 00 00 00 0c 00 00 15 a5 | 00 00 00 01 00 00 15 a5 |........|........|
|00002b80| 00 00 00 0f 00 00 15 ae | 00 00 00 00 00 00 15 ae |........|........|
|00002b90| 00 00 00 0c 00 00 15 b4 | 00 00 00 01 00 00 15 b4 |........|........|
|00002ba0| 00 00 00 0f 00 00 15 bd | 00 00 00 00 00 00 15 bd |........|........|
|00002bb0| 00 00 00 0c 00 00 16 5a | 00 00 00 01 00 00 16 5a |.......Z|.......Z|
|00002bc0| 00 00 00 0f 00 00 16 60 | 00 00 00 00 00 00 16 60 |.......`|.......`|
|00002bd0| 00 00 00 0c 00 00 16 7d | 00 00 00 01 00 00 16 7d |.......}|.......}|
|00002be0| 00 00 00 0f 00 00 16 86 | 00 00 00 00 00 00 16 86 |........|........|
|00002bf0| 00 00 00 0c 00 00 16 a1 | 00 00 00 01 00 00 16 a1 |........|........|
|00002c00| 00 00 00 0f 00 00 16 a7 | 00 00 00 00 00 00 16 a7 |........|........|
|00002c10| 00 00 00 0c 00 00 16 b3 | 00 00 00 01 00 00 16 b3 |........|........|
|00002c20| 00 00 00 0f 00 00 16 bc | 00 00 00 00 00 00 16 bc |........|........|
|00002c30| 00 00 00 0c 00 00 18 89 | 00 00 00 01 00 00 18 89 |........|........|
|00002c40| 00 00 00 0f 00 00 18 8d | 00 00 00 00 00 00 18 8d |........|........|
|00002c50| 00 00 00 0c 00 00 18 df | 00 00 00 01 00 00 18 df |........|........|
|00002c60| 00 00 00 0f 00 00 18 e3 | 00 00 00 00 00 00 18 e3 |........|........|
|00002c70| 00 00 00 0c 00 00 1d 1c | 00 00 00 01 00 00 1d 1c |........|........|
|00002c80| 00 00 00 0f 00 00 1d 1d | 00 00 00 00 00 00 1d 1d |........|........|
|00002c90| 00 00 00 0c 00 00 1d 4d | 00 00 00 01 00 00 1d 4d |.......M|.......M|
|00002ca0| 00 00 00 0f 00 00 1d 4e | 00 00 00 00 00 00 1d 4e |.......N|.......N|
|00002cb0| 00 00 00 0c 00 00 00 48 | 00 09 4d 6f 6e 61 63 6f |.......H|..Monaco|
|00002cc0| 00 00 00 dd c7 e8 00 00 | 00 00 00 f4 c6 9a 00 03 |........|........|
|00002cd0| 2f 0a 03 0d 00 ef 74 08 | 00 00 00 04 00 04 00 28 |/.....t.|.......(|
|00002ce0| 00 02 01 ca 02 00 00 28 | 00 02 01 ca 02 00 00 10 |.......(|........|
|00002cf0| d5 02 00 00 00 00 00 00 | 00 00 00 00 00 00 01 00 |........|........|
|00002d00| 00 00 01 00 00 00 07 80 | 00 00 06 80 00 00 00 45 |........|.......E|
|00002d10| 00 dd c7 e8 0d 98 00 00 | 00 1c 00 3e 00 00 4d 50 |........|...>..MP|
|00002d20| 53 52 00 01 00 0a 03 f3 | 00 00 00 00 00 00 00 00 |SR......|........|
|00002d30| 00 00 03 ed ff ff 00 00 | 06 34 00 e2 94 50 06 63 |........|.4...P.c|
|00002d40| 6f 6c 6f 72 73 00 00 00 | 00 00 00 00 00 00 00 00 |olors...|........|
|00002d50| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00002d60| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
|00002d70| 00 00 00 00 00 00 00 00 | 00 00 00 00 00 00 00 00 |........|........|
+--------+-------------------------+-------------------------+--------+--------+
